Merge "Unbreak testInstallEphemeralRequiresV2Signature" into oc-dev
am: 6382ce59c3

Change-Id: If0df40c8ff3d66664d3ddc77f0250fb1bd51003a