tree 3a4bd3967785a8d2a7686a3a49c593595880a328
parent a570426ec3de880f42613a1ea9bb2ef0a399df29
parent 89f0637bdec9810d41bb9a2ff7c900d33591a6c7
author Stephen Li <stephenli@google.com> 1512690948 +0000
committer Stephen Li <stephenli@google.com> 1512690948 +0000

Manually merge changes from giant AOSP topic

Change-Id: I1ea6075bfd53d3ed1e64100ea2bf0e574f0193da