merge latest CM10.2 changes

Change-Id: I8433538e39b14fea140fad075e4ba1032090b862