Merge "ContentSuggestions - restore snapshots when needed" into rvc-dev am: 93032f6f95

Change-Id: Ib6e04366387ac64f95d28774b886a085aea9c53e