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

* commit '238bfbec8907cc8ce3c1b3c69167f86783762d93':

Change-Id: I88b4a677b5d6575c6cd0e3fa8e03544518c90d23