am c0353726: Merge "Cherry-picked from 6f00e7fc in master. Do not merge." into ics-mr1

* commit 'c03537267d9da2124cdbf68d896bacf88d94cca9':
  Cherry-picked from 6f00e7fc in master. Do not merge.