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

Change-Id: I6010fda23167695d88f7a66738f5d45122e33738