Merge changes from topic "apex_earlymount_no_bionic_bindmount" am: 4cd0914048 am: a4015c04df
am: 943edd90ff

Change-Id: Icc6c8fa31a7bbaced91166535d200e8c0e2de713