am 28352aa: am 7cc0301: AI 147723: This should have been deleted a while

Merge commit '28352aafc2dba4e0f2c507649706389e1bea327e'

* commit '28352aafc2dba4e0f2c507649706389e1bea327e':
  AI 147723: This should have been deleted a while ago, since