tree 1e3e0d86718d8dad601e544e91ccb29cde8a6fe4
parent b330c5f4b8acf34f2a4099e3feba20b5e0b5123b
parent c6f2d08f054d973e92b4625923c2eedf9ec3b41c
author Stephen Li <stephenli@google.com> 1512689021 +0000
committer Stephen Li <stephenli@google.com> 1512689021 +0000

Manually merge changes from giant AOSP topic

Change-Id: Ia693a98a2713bcff5e59e484a8a2fc0d13c96700