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

Change-Id: I94e86de78b8d84f0d3a23ff627b0808812a47ded