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

Change-Id: Icf9235e5c1c3fdff2944e2c673840255f635eae0