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

Change-Id: Ibdb7dbda0e803e39d32529b19e37603ea6cc7db2