Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am: c6a6ef7e38  -s ours am: 54f2d178f6  -s ours
am: 76d6144ea7  -s ours

Change-Id: Ia7f5a5498cb1d406d4f1dc79009d9cdc4ecf8660