Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am: 698db8cba9  -s ours am: f7c18ab52f  -s ours
am: 8ae9bcbbd3  -s ours

Change-Id: I5c4fbd723b3b12eaca66b18ecaf3f35db96ca585