am: c37fb8aa * commit 'c37fb8aa': Finalize resource IDs for N. Change-Id: Ide5ce846a130624db23ab3df2fa3fc70d4e04eab