Merge "Update signature files to the new format"
am: a6c3d576e3

Change-Id: I5de2e646caaacfdaf649bf080e38f87b2f38dcbf