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

Change-Id: Ic31b4526537dde18109d922fb4077124e6153787