Merge cherrypicks of [13179827, 13179828, 13179829, 13179113, 13179114, 13179115] into mainline-release Change-Id: I08bea56a1c4ab32a9a8a1d8cf4b1734f3f27e48d