tree cefc6e755c5bb4fc4c82244888ac2b490d614bcc
parent 8bb27bdc393f741ce55a840bcdfca0e88fde86a9
parent a3c775e7d4713995218fddd314c24ab9916d9803
author Stephen Li <stephenli@google.com> 1512690640 +0000
committer Stephen Li <stephenli@google.com> 1512690640 +0000

Manually merge changes from giant AOSP topic

Change-Id: I9d01e92ac13dcde939606dc6a1487953a0705d34