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

Change-Id: Icb7deaa5e60880d783fc4c434bbd0e70ad2c188b