resolved conflicts for merge of ba35cf7a to master
resolved conflicts for merge of ba35cf7a to master

Change-Id: Id9e6fa12056fc6cef7b77c70c73591dfc82e70a9

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