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

Change-Id: Ice90f6c9a2579575a667d9552d59ea6e8fdd2a39