add review message substitution logic

Change-Id: I84e9cc644ecd759829f03f7037e639fed879188f