Port 85f43d522e from post-review to rbt post
Port 85f43d522e from post-review to rbt post

halvorlu/rbtools,halvorlu/rbtools,datjwu/rbtools,davidt/rbtools,reviewboard/rbtools,beol/rbtools,datjwu/rbtools,reviewboard/rbtools,1tush/rbtools,reviewboard/rbtools,haosdent/rbtools,haosdent/rbtools,davidt/rbtools,beol/rbtools,haosdent/rbtools,halvorlu/rbtools,datjwu/rbtools,beol/rbtools,davidt/rbtools