Merge "Make make_parent() to take const argument" am: 52e2a97aa7 am: 1fd9f0aff7
am: 260573b3c2

Change-Id: Icc898211217bf9ecfcefba02ecc96be17b636579