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

Change-Id: Ia1590d2e57d40b54fc799ba63a6e488b131dcc2f