am 11d12f7e: am fca5677a: Merge "Add null check for package settings" into gingerbread

Merge commit '11d12f7efc588b0e945c42952e67d96f2421dc26'

* commit '11d12f7efc588b0e945c42952e67d96f2421dc26':
  Add null check for package settings