am bd3b0000: am 4cd3e47e: Merge "Issues with messaging apps on non-primary user account" into lmp-mr1-dev

* commit 'bd3b00004c5aab43de0632994aa9a9d4e701ad5e':
  Issues with messaging apps on non-primary user account