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

Change-Id: I3c860f4e19cdd3b056c509dafbe53012269efeb6