tree 0525a31ae05b46b580f350a806d3bd7a22dbd4af
parent 1848c71bdcae8af3ece921c80223c3a82d645da6
parent f907a2bfb8c775662e1d752436b96c2de879bbf0
author Stephen Li <stephenli@google.com> 1512689135 +0000
committer Stephen Li <stephenli@google.com> 1512689135 +0000

Manually merge changes from giant AOSP topic

Change-Id: I37a99096193c1455e70e9582d8a75a5b6f59615d