Merge changes from topic 'early-mount-verity' am: 93072f2ce3
am: 2eb715d866

Change-Id: I32cc1ceaaaf1eaad47f7e4c129a520c5835ecd10