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

* commit 'efb951d4fefb004b94c0e3f9b3d8fab83b8803ca':
  Swap star tint.

Change-Id: I666e663e6875ca019ee3f313369d300eb3b9330b