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

Change-Id: I960d0745c904d0f70b7221b4efffa15bcac76389