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

Change-Id: I99e1d40877f3174a83554e80bb298ba59ca12ffb