Merge "Merge changes from topic "presubmit-am-b2e291a416ff4d26ae9b9ac0b0a7cf6e" into sc-mainline-prod am: 7ebd227a"