Merge "Fix guest tint" into oc-dev
am: 70d4423eb6

Change-Id: I65d05cbf2b3cc31e5fb2376eb3ab9a0782cc0c9d