cherrypick from hc-mr2 Change-Id: I1f8d5d01c7f526c6ac47a1e1e5f3e43bff196989
cherrypick from hc-mr2 Change-Id: I1f8d5d01c7f526c6ac47a1e1e5f3e43bff196989

Change-Id: Ibaa0c4bd277dbab1bc01861ebd2af16b3adf521e

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