am 7d5c68e3: am 84b4791a: Merge "Modified lollipop Easter egg for TV compatibility" into lmp-dev

* commit '7d5c68e31eea3848fd8fa75dfd9f7190ef1cd3a3':
  Modified lollipop Easter egg for TV compatibility