resolved conflicts for merge of 5554c0c0 to lmp-dev-plus-aosp

Change-Id: Ic07d4f265d58c7a56da2aeabb1c8007950e6f3fc