Merge cherrypicks of [17342786] into sc-d2-release. Change-Id: I9f3284bb26892f4be546021d4b762489586185c2