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

Change-Id: I8af9358fdbd6ae79887426671e1498cd6f875c0c