am d7d5f4d1: am c814271f: Merge "Fix Clear Credentials item"

* commit 'd7d5f4d1bfedda52c2686a08a62dec1fa02dba58':
  Fix Clear Credentials item