am e3df2510: am bad5fa1e: am 5e5ce873: Merge "Fix SecurityException crashes in onClick" into lmp-mr1-dev

* commit 'e3df25109cdca430695bc382e332d054d0c6b1df':
  Fix SecurityException crashes in onClick