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

Change-Id: I897c8e18fc27236fbc41837c75bc85d8e58e0fe3