[automerger skipped] Import translations. DO NOT MERGE am: ba8880dd87 -s ours
am: e2f660eb6a -s ours
am skip reason: subject contains skip directive
Change-Id: Ie20613bf58588878edc8d736dbe789bff4ce3902
This commit is contained in: