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

Change-Id: Ie8412a6af1298f02136eee6b585b5ff30acf885c