resolved conflicts for merge of f7fb5331 to kraken
resolved conflicts for merge of f7fb5331 to kraken

Change-Id: I61258dd7c7e52a6251c1d9499e113401ff375b20

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