am 452a4f58: am a35a7807: Merge "Fix NPE" into jb-dev

* commit '452a4f585d3cb707da0adf1fd91ba2c9c169b925':
  Fix NPE