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

Change-Id: Ib331ea2d4620c600ed0b0a28edbee66afefe120b