Merge "Fix NPE when ReviewInput's message is empty" into stable-2.9