Changes required for htc bravo

Change-Id: I21506ba534720dbb80b448c1a7da01895898f425