Merge changes I60b9e9ae,I8be89116
am: c3db303f0b

Change-Id: I2b98b3083c33dfd7e9e4a204375433c116f84813
tree: d5ab0e66eea86e43c81a1436c58f3954fb3e237a
  1. tests/