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

Change-Id: I513e54ea98bfff9dfb3a8e6c0a46373288af77bd