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

Change-Id: Ic2f134238e098c6b337bbb2707b9abafbe39e397