[automerger skipped] Import translations. DO NOT MERGE skipped: 9b8bceedc2 skipped: 1789ac6b28
am: d12aff917a  -s ours

Change-Id: I7400a1e8da6fde612c5b130228b28cf25ce5b99c