resolved conflicts for merge of 47bd7300 to lmp-dev-plus-aosp

Change-Id: I9631fb1774893d2eeccd7f1f5a867cb5dd98d53d