[automerger skipped] Import translations. DO NOT MERGE am: 91ca872a44 -s ours am: 075385c12e -s ours
am: ca93f79957 -s ours
am skip reason: subject contains skip directive

Change-Id: I4fcbdddc6d1dbde4321cc88a64a1e2314cf2eada