am d36a2e24: am 4b590db8: am a829f8e2: Merge "More cleanup prior to unhiding" into lmp-dev

* commit 'd36a2e24bd3bd52801b476e9d34ed2f06ee077f0':
  More cleanup prior to unhiding