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

Change-Id: Ic066f48e68bdeea59cb2125063cb5885d94dc80f