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

Change-Id: I5552daa47fd96119b704c41913979e782155cbb2