Suppress auth notification for provisioning errors.

Also clean up from the recent conversion work, now that the dust has
settled.

Bug: 13365490
Change-Id: I6c163a302b275381ea1fd07a2d096b1ecfd5f775
(cherry picked from commit 77670c227e8073f4300511b200162408a6e22b68)
6 files changed