resolved conflicts for merge of 76fb6019 to lmp-dev-plus-aosp

Change-Id: Ifc9f9fa95dda1dbe60b3be35ef30d2ca707c72d5