Merge "Move DeviceUtil so slim actions work" into lollipop