am ba4521bc: Merge remote branch \'goog/ics-mr0\' into ics-mr1

* commit 'ba4521bc66e78a3ede5e003513b3c91f115c8d50':