Merge "Handle devices without quota, speed up lookup." am: 36ba03a248 am: 411ae16a91
am: 9eeb77f0dd

Change-Id: I6f6004769a576003a5fb27bcd78470badf43d68a