Merge changes from topic 'rs-rebase-275480' am: a1b6d63257 am: 66e008159d
am: 77b71c3ea3

Change-Id: I31738b4bc65441b10506655ae9d055bc031dd942