Using my device/htc/bravo

Change-Id: Id4167005f7584a6059adf281abc308a006228614