tree fd146afd973bb5cb42e338cfd48db691e4092c87
parent d9ca796139a747dd3a811827a2c841e4baae36bb
parent 9b8ee6c0c5a6fa30ef247ca621573b03ec374994
author Stephen Li <stephenli@google.com> 1512690801 +0000
committer Stephen Li <stephenli@google.com> 1512690801 +0000

Manually merge changes from giant AOSP topic

Change-Id: I6570f8e55cbba95308cc3d0fbea4bae11d5b85df