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

Change-Id: I998deaae3a88dca0a2b685ed0899fee23f7942bf