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

Change-Id: I6a765657f600b3d13028c26ba8c9726265721b59