Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am: 2c709ccef9  -s ours

Change-Id: I36aaa841cc349605f0c2403f650ce2bcfa8f7e53