Manually merge changes from giant AOSP topic

Change-Id: I37a99096193c1455e70e9582d8a75a5b6f59615d