[automerger skipped] Import translations. DO NOT MERGE am: ab08793f52 -s ours am: 0ac5edb2c4 -s ours

am skip reason: subject contains skip directive

Change-Id: I52dbf5dc01513b4b1bbf6e4294c3e602dff47442