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
Change-Id: Ie688346955ec30474dd30e2fe45403c633cf105c