Merge "Remove duplication, split tests" am: b2f1edc3d1 am: a2e3137d9b
am: 5c8bec0a3a

Change-Id: I405e82b1204b9be7ab994696a3b3c1172cc8d5d5