resolved conflicts for merge of 4e14159a to master
resolved conflicts for merge of 4e14159a to master

Change-Id: I42dc1efc2218af326a826aeb16daded71722b363

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