Merge change I9297389b

* changes:
  Udating luni to Harmony r823222.