Merge cherrypicks of [16822123] into sc-d2-release. Change-Id: I712514013de6408fc74f4f116067d07b0c35be83