Merge "Manually merge 885aca1bbaa076b11914b9e4cb0d2a6d0c6fab3a to aosp-master"
am: 2f199d6b35

Change-Id: I385330c5d2d547dc12d8f5c21cccaf34289ce3af