am af6a2dd3: am ffd559ce: Merge "CTS Verifier on TV does not display menu" into lmp-mr1-dev

* commit 'af6a2dd32e1e7046b0530e6493cc2b0c4baaeb83':