resolved conflicts for merge of 4e94fe3e to lmp-dev-plus-aosp

Change-Id: I9d827debec0eea3d10cc04319f1e15bf8d904d55