Merge "ContentSuggestions - restore snapshots when needed" into rvc-dev am: 93032f6f am: 796d1efb am: 32ccfdaf Change-Id: I5ea70123f7f67f5806a446b595a200c1b35e9142