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

* commit '44d515457a55cdcd92257a711db8dd10f71f0175':
  Modified lollipop Easter egg for TV compatibility