Local account handling cleanup

Clean up null account handling and update local account detection to allow
for a non-null account to represent a local account.

Bug: 18959158
Change-Id: I0d5f7acb7d9a8d1ba7b6d3a4e0b6584e3646934a