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

Change-Id: Idf13b00a6e69f96d8496377ec2ce58944599666e