resolve merge conflicts of c522dc6 to mnc-mr-docs
resolve merge conflicts of c522dc6 to mnc-mr-docs

Change-Id: Ib4aedad4813a7973268239957b5103642941733d

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