[automerger skipped] Import translations. DO NOT MERGE am: 9a60ed5ff6 -s ours am: df2e0f3872 -s ours am: ed8e62c090 -s ours

am skip reason: subject contains skip directive

Change-Id: I3b9b464390e16eaab407c1d60e70806c695e4d35