tree 22109ad518236eb6f28aa35d121b6ba1140367b9
parent 56d630a3eda390d8514c1e1d9f36c95e7808d1dd
parent 75ae46d035ce600be3cac3ee597d5e379636fa42
author Dmitry Dementyev <dementyev@google.com> 1488944872 -0800
committer Dmitry Dementyev <dementyev@google.com> 1488945122 -0800

resolve merge conflicts of 75ae46d035 to lmp-mr1-dev

Change-Id: Ib80d006bbd7b76396b4941e001f5c69fb7b643fa
Bug: 33123882
Test: manual tests: