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

Change-Id: I867640a5496c42a6b10161a84c9aa1c6928153b3