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

* commit '453c275dfaa97e00d3e19eb583467859da3e7b98':
  fix build break