resolved conflicts for merge of 7521704f to lmp-dev-plus-aosp

Change-Id: Id4fe1e4c222c79a9b743e267ddca407976295248