Merge changes from topic 'early-mount-support' am: 4bd3facbb1
am: e0d7b830f0

Change-Id: Icd0db777090c067dba1ba01349a0d1f58adda1e9