tree 0b129f8c08afa9e7e75375a14746097e14ba1db6
parent 7acf6e28c8cba144f55326529bf2a34ddf876356
parent b97778712a7b129ca2288bacf4d3c4d5c396cefc
author Stephen Li <stephenli@google.com> 1512690834 +0000
committer Stephen Li <stephenli@google.com> 1512690834 +0000

Manually merge changes from giant AOSP topic

Change-Id: Idf009f97c0572d34640d355fe02d78b7e27f4a1c