derp fix -- used 10.1 branch before...now using the 10 branch

Change-Id: I94a8246e3c4b70ce8703b0ab4d4a9924d9d5f5f1
add Defy & Bravo

Change-Id: Ib91113e302ac77202ea354772d1996b47fbd4117