Update for 4.2.1

Change-Id: Icc71eee9f5e8dcbee80ab278f2efde19083cf21d