Merge "Refactor duplicate code into single function" am: 1b118b032b am: 3ea2bfe8c1
am: f153c4d29e

Change-Id: I8a2207d5ea3d1cc93b731df9e47aa4f98dca87d7
tree: 23efe0bcde58ee9cb54bdd92b2db4088f217164a
  1. tests/