resolved conflicts for merge of 037b54cf to master
resolved conflicts for merge of 037b54cf to master

Change-Id: I1bc2827596a349963d8aa2b63b3f7801f155668a

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