Avoid context leak, drop credentials. Fixes-Change-Id: I4ecdc08df477960f0e884d7e31e174ad6d47e6e0 Change-Id: Icb076aa2ed5b089b61494bafefa2cc1479f762c2