Update for cm-10.2

Change-Id: I6f3a38ab8d654421e7475b55453ed6ff8de570bc