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

* commit 'a829f8e2462157c16f60a52edd39b3c49209ab76':
  More cleanup prior to unhiding