am 19744204: Merge "fix build break" into jb-mr1-dev

* commit '1974420465076bb9eee95a9e3ca1b09e3d506fd6':
  fix build break