Merge changes from topic 'eng_first_stage_mount'
am: b7e2f272ee

Change-Id: I0a88bdf24261b374cfd58ff15eb390a682cf5653