Merge "Set error code on failed keyset manifest parsing." into mnc-dev