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

Change-Id: I2f4e4e931c32cb458025a7e6963fa9fe8df5763d