Use I21440625's indication of file content matches

Change-Id: I421f4775fc7b179fcf2eac6afa614ef95702ab74