Android 5.0: Patches by pawitp