Merge changes from topic "am-dd7b05d27e59420687cc02c82e51669b" am: 7898d269e2
am: 9b40813361

Change-Id: I80dd1fb1ace8d0fb26597957926e4de58b288615
tree: b64a77eba9658c782f258e9b28cc11ef423fc769
  1. tests/