Updated to missing commits of CM10.2

Change-Id: I3d2381d65a7af86b8e6d90d1e743831108cd9363