resolved conflicts for merge of a4eb81b6 to lmp-dev
resolved conflicts for merge of a4eb81b6 to lmp-dev

Change-Id: I73b225141e09826b40e4941140b59d1c163bd9c7

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base