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

Change-Id: Ifbc86666247533415e0449a859bc3ac166866169