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

Change-Id: I623ee5f126f6902311722eb2351b43ffaf4c95ba