Merge "Disable APPLY_HARD_QUOTAS in favor of "resgid"." into pi-dev
am: 936497301f

Change-Id: Ibfe05f0c30e29b5b9ee5444809b60d8a9b2a0049