Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am: 8181498163  -s ours am: 9b14186afe  -s ours
am: 0cf9428986  -s ours

Change-Id: Id62abbbef40ec89540c249bb267e699526bda02d