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

Change-Id: Ie1cbb285490c868aae442bed207482fd9c7132d7