Clean up and catch up to Upstream aokp