am 686547e2: (-s ours) am 481134c0: Merge "Remove Elliptic Curve CA certificate" into gingerbread