Merge changes from topic "signature-format-v2" am: 16518030cc
am: 1e0723373b

Change-Id: I940221af2a6e6314fc264b2c8f7bd4a65f8bab35