Updates for syncing with android lollipop