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

Change-Id: I22006097e4ff21843030e9bac2138c9d2c5b56f3