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

Change-Id: I389a6f36dd084e96bde2c4cebf2f04e49505c168