Merge commit \'4158fbc54acdcb2c7cc52704a45e0e9f3e93ffe1\' into HEAD am: 02fa7b88cc am: ba68fcfa5a
am: bf2d4c864a

Change-Id: Ia8288753847ee764f197d3a145afb8f5f70fb5ed
tree: 554d8e3d3f5eac505bd136a2e7420c47c543372c
  1. tests/