Merge "Move resource IDs to greylist-max-q."
am: c6d4f0dd69

Change-Id: I489fdbe0b6b7ec1a3096b6170645e4227343ce7b