Merge "Swap star tint." into nyc-dev am: efb951d
am: 1cb2dd9

* commit '1cb2dd9a8f6eee9063dca5f2f61fddd71b926b05':
  Swap star tint.

Change-Id: I45b69329619ca1d561df99c59da6340ddcaf4357