Merge cherrypicks of [14669877, 14667805, 14667806] into sc-d1-release

Change-Id: I6a0856ca31a5ef4f21f60de3fa91d86b9da2c049