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

Change-Id: I9c5b1e4d9045be44900d9d6d5351cf8cd2a5060d