resolved conflicts for merge of 307f6508 to lmp-dev-plus-aosp

Change-Id: If49761765f3346993fb67068e79dad65e161c6a5