am a8e634ca: am 104eea0b: Merge "DO NOT MERGE Change bluetooth off display message." into klp-dev

* commit 'a8e634ca5367dde80873a0b7643e27284db56336':
  DO NOT MERGE Change bluetooth off display message.