am cb640c62: am 68d3e6c7: Merge "Implement trust managed visuals" into lmp-dev

* commit 'cb640c625d063a757b5deb9b15a971745aacb8d6':
  Implement trust managed visuals