Merge "tests: Refactor the common lines in UpdaterTest." am: faa47854f4 am: 83e341e754
am: f4b2c3645e

Change-Id: Ie2860f2e5502071b8a52802a917795ddf751c744