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

* commit '4b590db8c50c5d75aea96aa9b5240827bd5e5495':
  More cleanup prior to unhiding