[automerger skipped] Merge "Fix null pointer exception" into pi-dev
am: 5e3a62208d -s ours
am skip reason: change_id I5ed2dc7f0da3611f502d602d15b3b3d1a7ccddcb with SHA1 85121de107 is in history

Change-Id: I6baa1c0ceef77cf68cb3763959978b3b22853c6e