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

Change-Id: I39cf43c07d052983837e6c32a132bae86673dbbe