Merge change I1d96b51e

* changes:
  Merge branch 'archive_888752' into archive_dalvik