Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 422b17438b  -s ours

Change-Id: Icdd126fb90cdce54c2bf44e1ef924c8ea19951f0