Merge changes I8c2d29be,Ibbc58c3e am: 831196440e
am: a8824acb8c

Change-Id: I53a6272b9f78912553bd061c503d12db2d1c45c9
tree: 69408dbfacb7bc90bdee2154fc6270a580d8bb19
  1. tests/