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

Change-Id: I45ade8c71a8b5e4291a5c952f8458ec52f266052