am 3a437c78: am 208eb3e8: Merge "Android TV DevGuide home fix (no pic)" into klp-modular-dev

* commit '3a437c784650930b770a9eb2e9a2620e08386725':
  Android TV DevGuide home fix (no pic)