Update to bring in line with CM 10.2

Change-Id: I229ff4431281769474cf2c76a715d33f9a5710b4