Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 1536c4ed80  -s ours
am: 5dfa99ab35  -s ours

Change-Id: I26f1ed19c9ce428ca835e4f4db33f36bb71be8e1