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

Change-Id: If92190894307fe9dfa8cab048de5a3dc5178a7b1