Upleveled changes from android.
Upleveled changes from android.