tree 1ab5bd3998b1a665546c0dcd6718edf558ac0df3
parent 8e91d30b966dc57e86cbb2f7a76ccfa5bf68fe66
parent e6ba58447453f239509742a09467d67cb031d1b0
author Stephen Li <stephenli@google.com> 1512689172 +0000
committer Stephen Li <stephenli@google.com> 1512689172 +0000

Manually merge changes from giant AOSP topic

Change-Id: I28b3b0797cd94e37c0d6523cf8872a4c46cf4cf0