Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 3f31cfa6cd  -s ours
am: 682e764e52  -s ours

Change-Id: Id501722fe47efcfdad4e7af5810e27ba132aab2d