am 1cd614c6: Merge "Ignore dying users when testing for number of users on...
am 1cd614c6: Merge "Ignore dying users when testing for number of users on device. (Bug 7332248)" into jb-mr1-dev
* commit '1cd614c6':
Ignore dying users when testing for number of users on device. (Bug 7332248)