Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 817125f6ca  -s ours
am: 05b78ffec7  -s ours

Change-Id: Ia3a452f1beb2b92b4833823aa935508c99f75433