Merge "Localization for Android fundamentals Bug: 20503562" into mnc-mr-docs