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

Change-Id: Iac40eff31f56f5ff0db177053a3b73a5b20340b9