Add changes for Lollipop for Omni