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

Change-Id: Ia18736bbf51e2691c2986db4321357ad40f285ac