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

* commit '5ed112666bf5f4f4d530d2cdb6fd384626db569a':
  Check for NPE when creating Bundle

Change-Id: I27112aab0f4c4adbc0b877413429e86c2fe0a784