Merge "Fix string for tablet" into jb-mr2-dev