Updates for CM12

Change-Id: Ib1045b39c5bc88d5081372e6803cfa784e6795d1
Updates for Lollipop