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

Change-Id: I708c02a5627dae316833f73f232728032b4b3d2c