Moving these files should address the failures in the daily tests. Change-Id: I438adba1a45bdf6083651b6b3f610c8bbe4ebdf0