Initial commit with required changes for htc bravo