Check for NPE when creating Bundle am: 5fd3f2e7a1 am: 695cb7d792
am: 438bee486f

* commit '438bee486fe47814bf837d2b1fbfea5b2bbe4686':

Change-Id: I6ca4120ef73c02d4c0d590816fce0d5394ea871c