Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: ffefbfdb9d  -s ours
am: 630fac14b8  -s ours

Change-Id: I1df41a9ac5d9cf4b8674c4f9ade533764fc7a0b4