Merge "Keystore uses 0 for invalid operation handles." into mnc-dev