tree 2ee6dc8fe789340553a66e15d20aa4d7b8dee2a8
parent c53d7f6f6678d74f0bbb03e0d2b693897c668478
parent 465cacaa49912d5a38cc538da8dcc679f6ac9813
author Stephen Li <stephenli@google.com> 1512689265 +0000
committer Stephen Li <stephenli@google.com> 1512689265 +0000

Manually merge changes from giant AOSP topic

Change-Id: Ia7d49acf78f4ed462f749a2cc18d939e4ccf3dfe