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

Change-Id: I8e56bc1bcc358678e78912ed337447edc4a80e94