4.9 patch

Port over new and old patches from aosp that were found missing