Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: fdd8c4bbee  -s ours am: 3b5113a48d  -s ours
am: 45adfd8ac1  -s ours

Change-Id: I5f301fab68049ac2da542f5636891377e4c5e308