Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: f9cf2df461  -s ours am: 33b0f435de  -s ours
am: eed665acfd  -s ours

Change-Id: Icdfc1004381d27021fd9ff5d9f257b575143f07f