Merge changes from topic 'pre-early-mount' am: 1549257ff5 am: c027aac7c8
am: 9e140bb206

Change-Id: Idda7bee037b87bdb0aa8a26d2cdb9ee7b90b0cbd