Check for quota being present before accessing it

Change-Id: I383741fb330f9b8fa3dc5fd6aab837d2989d2f2f
Merge "Check for quota being present before accessing it"
Merge remote-tracking branch 'upstream/master'