Merge "Fix shift/mask error in ArtbEvaluator" into jb-mr1-dev