Manually merge changes from giant AOSP topic

Change-Id: I68d32ab6a9559b306a56aa8021da0c042d012f74