Merge changes from topic "am-4a80c23f3c6c420e98f1331a523bf986" am: 7aa66922dd
am: 3d5a649ea6

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