The status quo is that the files are the same. They probably should not be, but we can change that in a later change. Change-Id: I78322202235ce6a1dd6487c5debde1ad1dd546ae