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

Change-Id: I58db246d8dd59d6863b43f9e4fb442e9e363de94