[automerger skipped] Import translations. DO NOT MERGE am: 508b5486f4 -s ours
am: 06ad738ac3 -s ours
am skip reason: subject contains skip directive

Change-Id: I860692f48122d2bf4f48272e52fbce3f449c6a52