Committed this to trunk. Thanks Allen, Aaron, Eddy, and Brahma for reviewing the patch.
still jenkins shows following..
I don't know why jenkins build is still failing. I tested my patch and it worked well.
please fix the check-style issue
The warning "the line is longer than 80 chars" is unavoidable. If we are to render the line, we need to break the tag.