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

Change-Id: I4e3887d2400fd8e41157cdd53abba695209698bf