More flexible way for message about revert to snapshot

Change-Id: I513c26735b8edb48da003555fc73e1236a1ef3c3
Merge "More flexible way for message about revert to snapshot"