am 8073bbc: am ef71222: AI 147838: A couple of fixes for making the

Merge commit '8073bbcc99d6a66f49497915ee12ce13f5b2ef85'

* commit '8073bbcc99d6a66f49497915ee12ce13f5b2ef85':
  AI 147838: A couple of fixes for making the