Merge changes from topic "am-a5bc4e54a433400f95783af4f8ba4da2" am: c660e3c3f2
am: f73858ce33

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