Merge "Replace hard-coded "2" by a constant and comment" into jb-mr1-dev