tree 7280cc707ebf6b447cbd684b5c296bf58e4ddb20
parent a41cc29447af5667a237475ba483b7ebf6009cf7
author Tianjie Xu <xunchang@google.com> 1484871511 -0800
committer Tianjie Xu <xunchang@google.com> 1484871511 -0800

DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev

Change-Id: Ie52a9abae416bbb84ddc61bb7159a531de778c15