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

Change-Id: Idad7a04e36e96fb3c0a9770ee58ad121990ca3d6