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

Change-Id: Ic7bed57d9629af59851555dc0aeda40b13b4cb0f