Merge "Don't persist description res ids as they are subject to change." into rvc-dev am: 6c725002b7

Change-Id: Ib09f657334f6cc06ddcae86d4858353f4b9f69ca