Merge "Allowing zeroes in trusted OS SMC return values"