Check for NPE when creating Bundle am: 5fd3f2e7a1
am: 53888e9569

* commit '53888e9569ad32bb25a7fad6aa5c642bb45d068d':
  Check for NPE when creating Bundle

Change-Id: I18f53f5fbd4070a0d5794957e88ed884713ffbbe