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

Change-Id: I9118beaa5a0ef7ac10a9291edec5285a6b452ee7