Merge cherrypicks of [17949644] into sc-qpr3-release. Change-Id: I52ec85b9eed9c6cfdd71a9b9b3fba79bc7af5781