Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: 464f60e489  -s ours
am: ca24f0f89b  -s ours

Change-Id: I4d3b05f90c357c4a58ff6a861fbafd2783809a12