tree edcc46ad32aee0607ab8872696878d4b9fe964ef
parent aaa0f607763d5a4d5b9c7ad74df70e616902b604
parent b76f591f950c3dc0343e1caf1cc05b6471f6940b
author Yuexi Ma <yuexima@google.com> 1505512969 -0700
committer Yuexi Ma <yuexima@google.com> 1505755011 +0000

resolve merge conflicts of b76f591 to oc-dr1-dev

Bug: 64734869
Test: mma
Change-Id: I9d8bb9c9519859e9c7d7b75ef4434c447c28dea6