Merge "Handle user consent denial sooner" am: 62b3ec5981
am: 97f1721bd4

Change-Id: I9aa29c5c24c2f9a7f13bb3e53e7f43c2a1011205