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

Change-Id: I773b0782b18ea8a4fc6d99359efec8df3b9493c1