[automerger skipped] Import translations. DO NOT MERGE am: 01379e6414 -s ours am: d3d9ccc4ee -s ours
am: acd81744b9 -s ours
am skip reason: subject contains skip directive

Change-Id: I36da45c726107e1d3459792dc511ec3d02435ff3