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

* commit 'cb1e32ac2b5eb12ff89af5eb8074908b5f54d047':
  Modified lollipop Easter egg for TV compatibility