Update for Lollipop Hazy build