Merge "fix is_secret_key_operation check" am: 7f35beb6cb am: 216b33f09c
am: 4623971442

Change-Id: I0f2320b758bcfe6bb2e5ab1dffab185100b89cc0