resolved conflicts for merge of bd38710b to master
resolved conflicts for merge of bd38710b to master

Change-Id: I3489b6909ce2a215318d45f809b82579503fd733

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