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

Change-Id: Ic0efcbe99e1f9aae3001e576ac12fed23e5a431e