tree b719b6836ee243cb7ab78893df23b3be75d84de0
parent f81038006b4c59a5a148dcad887371206033c28f
author Dave Weinstein <olorin@google.com> 1465927501 -0700
committer Zach Jang <zachjang@google.com> 1465942907 +0000

Resolve a merge issue between lmp and lmp-mr1+

Change-Id: I336cb003fb7f50fd7d95c30ca47e45530a7ad503
(cherry picked from commit 33f6da1092834f1e4be199cfa3b6310d66b521c0)
(cherry picked from commit bb3a0338b58fafb01ac5b34efc450b80747e71e4)