Merge \"One final tweak to the platlogo. am: 4b7e415803 am: d930306e13\" into nyc-mr1-dev-plus-aosp
am: 670b95928d
Change-Id: I1b6b4c81a45c839d4d5b8cc79d196c6a4348e53b
This commit is contained in: