tree a7182a17ea9eec032b9cd7865347eac28131138c
parent 895a7e79d063a066ce1a2f04afe2373bb7b0bab6
parent 9aee58d2c1ccfce76d6d43d67a6edf70a05dcb7c
author Stephen Li <stephenli@google.com> 1512690926 +0000
committer Stephen Li <stephenli@google.com> 1512690926 +0000

Manually merge changes from giant AOSP topic

Change-Id: I85def09e451a21b8eecd0f023fcaf2d2151d5136