Merge changes Ic19b3b64,I26ca370f
am: c5ceda2354

Change-Id: I177af60357ae999a05d3b017c720df29753249d1
tree: a1e406b2e77fc4da29d37d532d32a1317f142124
  1. tests/