Merge "Add missing test files to compile." am: 32ac9bfd09 am: 793ffcbf20
am: 6864f006a2

Change-Id: I76543669231ac564f14921beabcc705c9850bd4d