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

Change-Id: I9403e618bc647742b11c4b4428e4bebef78728d9