am ff9bf0cc: Merge "Fix potential NPE when proguard is on" into lmp-mr1-ub-dev

* commit 'ff9bf0cc0dfd5c60037620917362789db000dd57':
  Fix potential NPE when proguard is on