reconcile vs985 with cm

Change-Id: Idc2f5035c8543dd8b822331bffab91923248e873