Merge from AOSP

Change-Id: Ie444a93a1fcba693332d302de828bdc62fd61647