Merge "Remove duplication, split tests"
am: b2f1edc3d1

Change-Id: I473e7b9d7977b06f2b11eaf95d21c1c51ff0e32b