Commits
Alex Light authored and Brian Carlstrom committed a25dc2bbe70
resolved conflicts for merge of 37651b60 to lmp-dev-plus-aosp Change-Id: I1fe0e64d2069b7424014bd3ff0bf6f80b439220d (cherry picked from commit 1faf2d0d25550dc759481fd523456711808e8251)