Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 422b17438b  -s ours
am: 49cc0fd2f8  -s ours

Change-Id: If6132f679d6bd5aa37a1e4645c4494523babda6f