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

Change-Id: I17bf2a322c0230f7cb368edd337e945742a10585