[automerger skipped] Import translations. DO NOT MERGE skipped: c2a85c8927 skipped: 43bd9fa8b2
am: f028e75015  -s ours

Change-Id: I7415cd61d98275b3d07e17efa2be8026a2a6b6d5