[automerger skipped] Import translations. DO NOT MERGE am: a761947a07 -s ours am: 8d05dcaeb5 -s ours
am: a13d2987ce -s ours
am skip reason: subject contains skip directive

Change-Id: I919a6da27e389b696dca3d6c9fe9d03888d82647