Merge changes from topic 'rs-rebase-275480' am: b167d69629
am: 4731f75a07

Change-Id: I90488ba7ede147e244d0ca7d078a356b236ddfb2