Merge changes from topic "apex_earlymount_base" am: c676cca4f6
am: a192ff7ad3

Change-Id: I5c3603ace0237ce810f820b456a7d3b9b4c113ff