Manually merge changes from giant AOSP topic

Change-Id: Ie0219fcefd3cdb6165711f50ad1c07769d5410fd