resolved conflicts for merge of 525f2f30 to lmp-dev-plus-aosp

Change-Id: I74f36b70583f4faf57befc9c6371ffd69e9a7cf8