resolved conflicts for merge of e4ec1e94 to lmp-dev-plus-aosp

Change-Id: Iec97b6a1cb7c29073bf9d1ae37d8600ff2ae9a8b