Merge changes from topic 'avb-early-mount' into oc-dev
am: cc23327951  -s ours

Change-Id: Ib1290196a8f08ffecf936f4393807d69c77eaa10