manual cherry-pick of 45f8e6a523a096a3781f90d4fd5d54dcc0673a7e

Change-Id: I770948540f3aca9d930edea7a12119ff63fe9bdf
81 files changed