[automerger skipped] Import translations. DO NOT MERGE
am: ad61024725  -s ours

Change-Id: Ide754ffc7c6a9f2957857317b99ef37963d91e1b