tree 17a9b951c163abe676c95d3cbe694721f35ea273
parent b53c9ccd9814a7f3eceb6fc9d0cb9b5fddc42271
parent 57d675ce59a1763d614018a1850dbe57f27bf0f9
author Stephen Li <stephenli@google.com> 1512689214 +0000
committer Stephen Li <stephenli@google.com> 1512689214 +0000

Manually merge changes from giant AOSP topic

Change-Id: Ibcb55155d2c3e9afb9f6f023dba3bac11da223fb