Merge "fix is_secret_key_operation check"
am: 7f35beb6cb

Change-Id: Iaac7f832e1a729be5fea1f5bb8f4a2bc0248d8ae