Merge changes I37c5df89,I453d8359

* changes:
  Move password test package to sdk 26
  Add resourceImpl shadow to tests for sdk 26