Merge in stuff from mako (kitkat -> lollipop changes)