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

Change-Id: I5e395b738d0769992e05c31331015ea7a347b129