resolved conflict for merge of fc51aaec to master
resolved conflict for merge of fc51aaec to master

Change-Id: Iee4d9ecc946dd1bbf114a70ad32db0fe47a027df

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