Merge "One final tweak to the platlogo. am: 4b7e415803 am: d930306e13" into nyc-mr1-dev-plus-aosp