[automerger skipped] Merge "fix null pointer exception" am: 09fe4c0241 am: cbd4680c1f
am: 6057aa4341 -s ours
am skip reason: change_id I544b9599dca628cf80f36f9f2a9474ea61d6f12c with SHA1 2bb91e4424 is in history

Change-Id: I618c083c9e2642c31ab219d40f9d9bea5c90c238