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: a0dfa52e
Change-Id: I397131ca8b5c195c670aa47378cae28bea22de63