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

Change-Id: Ic2adcfae98a810db63fe225c0c69d01fad085e32