tree 7b79737e68d359efb79979bc85791b533f89efa8
parent daa86d8b70ba1018f03867f79eb685c9f5d3d591
parent ad1c9ca812b8fe0b631fd25d3f8bd55c7c9a6022
author Stephen Li <stephenli@google.com> 1512689570 +0000
committer Stephen Li <stephenli@google.com> 1512689570 +0000

Manually merge changes from giant AOSP topic

Change-Id: Ie4cb14562dba8071880c95481a68556633e02da5