Merge "DO NOT MERGE Han Preference" into jb-mr1-dev