tree 146303bbe2e1c6e5738de9ad774c2a240e185cae
parent 0b88db497d350e4930343e80ea205c249a2981f4
parent 46a7965bc5d0d2a537412fdff9c5e2b1c3f91b2d
author Stephen Li <stephenli@google.com> 1512688902 +0000
committer Stephen Li <stephenli@google.com> 1512688902 +0000

Manually merge changes from giant AOSP topic

Change-Id: I855d9d0941c8d2bf9292590dda975b3ee2d3b71b