Merge "Don't persist description res ids as they are subject to change." into...
Merge "Don't persist description res ids as they are subject to change." into rvc-dev am: 6c725002 am: 1c5a6ad4 am: f6007abf am: 81a1efe5
Change-Id: Iacb655ff6891a38084a3bc449b9986ecd36ef754