Squashed: Lollipop bringup 2/2

Change-Id: Ie122bcf513e554f4fbe386bac1fafb8d9bdd5032