Merge changes from topic "remove-Bug8146568"

* changes:
  Remove Bug8146568 test.
  Remove Bug8146568 test.