Merge "Cancel outstanding user consent request" am: 473ccd388e
am: cd8f8cbb73

Change-Id: I79914f12319cf1ff7269dcb142a2e8228f13d1d5