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

* commit 'bad5fa1e21faaa77b65545d0c59f381af8b3f09b':
  Fix SecurityException crashes in onClick