10.2 bringup

Change-Id: Ib7513dc8e1511a046f734b35e90c917d019a5fee