Some Updates for cm10.2 Branch

Useful changes