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

Change-Id: I37527b26ea30fb43c5be0e47df3a728ce0ceb54c