am bce1667e: Merge "cherrypick from hc-mr2 Change-Id: Iab16cc2be71d6f19569c3c2ea716121922ec8325"
am bce1667e: Merge "cherrypick from hc-mr2 Change-Id: Iab16cc2be71d6f19569c3c2ea716121922ec8325"

* commit 'bce1667e7ae69ff575e73e776040524fb5515c5f':
  cherrypick from hc-mr2 Change-Id: Iab16cc2be71d6f19569c3c2ea716121922ec8325

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