tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904
parent 1760c2bb59ce4f83a856412a8d4d64dd5e8e2263
parent 2ea3bab393ebd6da73e3f9e5b2ef5f81e98a4f40
author Stephen Li <stephenli@google.com> 1512690705 +0000
committer Stephen Li <stephenli@google.com> 1512690705 +0000

Manually merge changes from giant AOSP topic

Change-Id: I0808da42d7c2bfc4b81d1ece18a34f7605ca5f79