Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 3fdeef487f  -s ours am: 926f064dab  -s ours
am: 4f32faa3bf  -s ours

Change-Id: I71a90c42e09484013842bbe579a117db32823826