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