Merge changes from topic "am-f19c1bc8474a40c18b6f95c5c34b395d" into nyc-mr1-dev
am: 2cfab2140f

Change-Id: I47143f087d2b880301afada9e50d5a84995b04d5
tree: ecb1d417d3c7d2716b03ed5e7600972b0c46b7b8
  1. tests/