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

Change-Id: I80015e96b7658dc3d2a94f33637422b413c285e2