Merge "Handle devices without quota, speed up lookup."
am: 36ba03a248

Change-Id: I38d4e01057e3cd65f4362056336294e8136df459