Merge "Merge \"Fix mistranslation from the NDK changelog.\" into nyc-dev am: 95fbc2de" into nyc-mr1-dev