Merge changes I60b9e9ae,I8be89116 am: c3db303f0b
am: 3fc54a07ae

Change-Id: I7dbe2879e00bb9f7614ca700b40fb54e7e3f1744
tree: af9ffa8438def3e7233d595d436c39eba014435a
  1. tests/