Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: b14cc5cb65  -s ours
am: 65b4198de0  -s ours

Change-Id: I80e0a24252967ecf273e750f81c6f7f8e454e31e