Manually merge changes from giant AOSP topic

Change-Id: I86d31efe5216119c81a94bc6d2c499f2a4ba2016