Merge from AOSP

Change-Id: I41161514ae072b40bf4c94a9392007de1e9db937