AOSP changes

Change-Id: Iad3fafbc36009bc69fbbdf3c5cc8145c162a0110