Switch to Chameleon Branch

Change-Id: I6e924cb31e0f33837a3755a73c8b6056c59de738