Merge changes Ide50c715,If9d7e5ef am: 2df0ff2ed7
am: f68d703e99

Change-Id: I90036618d69e8ac0c74fdacd346622a24024d9f9
tree: 39730fb3ceef8110ca13d5b557b037e5df879a67
  1. tests/