Merge "Parallel calculation of v2 signatures" am: 8ab05bf25c am: a231726f60
am: c7642d3133

Change-Id: I78cf532e0f4363fd3d5550c495a29faea99d5f24