[automerger skipped] Import translations. DO NOT MERGE skipped: fc4347f98e skipped: 8b2ac4fffa
am: a72fe6a957  -s ours

Change-Id: I659644d1abcb04788c35591a290440e8a990e79c