am 608ea322: am 6d0e8711: Merge "Delete unused/non-working code." into lmp-mr1-dev

* commit '608ea322868385aaa46c20887795e72bf7068479':
  Delete unused/non-working code.