[automerger skipped] Import translations. DO NOT MERGE am: c054f231ae -s ours am: 15ae4ea8e2 -s ours am: b84ad0d8f8 -s ours

am skip reason: subject contains skip directive

Change-Id: I8bdbe317c5b1f562f905aa4c4bacb408a49dfb9d