Update to r1.2

Change-Id: I0a380b2dcf502072a31c70fb271abb4dc8fb6fe4