Merge "Update signature files to the new format"
am: 1f4cce2f19

Change-Id: I07555e12c7364b92cd0540e2e441cbfa9391bb34