am 2d8d20f4: am 5c681c17: Merge "Add translatable="false" to setup wizard\'s...
am 2d8d20f4: am 5c681c17: Merge "Add translatable="false" to setup wizard\'s string resources" into jb-mr2-dev
* commit '2d8d20f4':
Add translatable="false" to setup wizard's string resources