Lollipop bringup

Change-Id: I1761fe1cf1d648d9f87274fc2abeabf253b742b2