Merge changes from topic "am-16b0b195e940437c988164c18e28c9c8" am: 2a559a04cd
am: 02c310f568

Change-Id: Ibfa12caa78f809e1588d9dd4640022a7d31b155f
tree: 80ca5489f3519d96804a56addbea9ee72ff5ec88
  1. tests/