Merge "Make Color non-final because apps break..." into oc-dev am: c0c524af4f
am: 97497985ad

Change-Id: Id10b82a9f6e6092a121a3fb35b28ff120b35b86f