10.2 bringup

Change-Id: Ic9802ea84b837d885bab18e0b31c120e920c7fe7