Merge changes from topic "apex_earlymount_no_bionic_bindmount"
am: 4cd0914048

Change-Id: If31c1ac798d3aacd2a2aaa1f1c6e0695e3952a82