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

* commit 'efb951d4fefb004b94c0e3f9b3d8fab83b8803ca':
  Swap star tint.

Change-Id: I2c05cd4c3ca4954114c68abe9baaae19a33f75c3