am 8cee535: am 974cdcd: AI 148692: Merge change #148679 into Cupcake, si

Merge commit '8cee535966608f63ab11fe127c9045838974e08f'

* commit '8cee535966608f63ab11fe127c9045838974e08f':
  AI 148692: Merge change #148679 into Cupcake, since we probably want to