[US159.1] [CCA patch] Merge from Android-x86