Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: ba09ef4367  -s ours
am: e4dc563787  -s ours

Change-Id: If6792261428def8d09e0a6b92d4522ea011cf996