Underp previous patch

Change-Id: Ie8e4ad01178ef300fdd7a71fdc613fdf5e915369
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2