am 266303fd: Merge "Avoid SecurityException when calling getUserData" into lmp-mr1-dev

* commit '266303fdb02ca1cf6df348e1af6830675476fd78':
  Avoid SecurityException when calling getUserData