Manually merge changes from giant AOSP topic

Change-Id: I658f8f515c4fd7fe567869d8ce145b6f53081ffc