tree 06142c9ba14d50535da9dbc31948770d36095235
parent 06976791e9740a9b737c2835f7dad0409e78ed83
parent be0f640c346ab79f23df0dcc30df6c7410e73ea3
author Stephen Li <stephenli@google.com> 1512689248 +0000
committer Stephen Li <stephenli@google.com> 1512689248 +0000

Manually merge changes from giant AOSP topic

Change-Id: Ia7d52dd63ae081828ae5fe91af75e86c0ffd592b