am 0ee9f361: am 0b5af04a: am ebb38bcc: am cd2b54e6: Merge "Accessibility no longer overrides strong encryption." into lmp-dev

* commit '0ee9f36140530cf8ee60613f4f057c2ec95fe498':
  Accessibility no longer overrides strong encryption.