Merge changes from topic "am-19e9244725df4b0eb80716c24e59ab9c" am: 420c69b8a1
am: 688b3f537e

Change-Id: I876698eb3453dd65ff0f0116c148f2812ec9a60b
tree: e853df38a4cfac445da5c8c09439d780ca49595b
  1. tests/