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

* commit '695cb7d7923ed4bc73490828795efa31b1509196':

Change-Id: I27e2949b4777a0803d33282875c530f1232878f9