[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: f98c32434b  -s ours

Change-Id: I47caedef56b13d32d7756531e0fab35f11367593