Merge cherrypicks of [1592971] into sparse-7070116-L82600000815924205

Change-Id: I06b57f3c6da55ed01c1f7b1698d39ee0a0bb1412