[automerger skipped] Import translations. DO NOT MERGE am: fef85b3c7b -s ours am: 29f347eef3 -s ours
am: e1b0efcdc5 -s ours
am skip reason: subject contains skip directive

Change-Id: I08d5825e1bf759fe9ef6a01d4448cbfab1fc1163