Manifest update after merging with lollipop-dev