Merge changes from topic "am-a1e8782806b548b280daa90a2ff2320c" am: e2201303a6 am: 35dfddc30b
am: 89a6cd1bc2

Change-Id: Ia21e8e27c98a8bc6b64d021867740a2750ac2881
tree: e5f80f1c4246d14fb520cb677b261d5e47acc301
  1. tests/