[automerger skipped] Import translations. DO NOT MERGE am: cd1846edf7 -s ours
am: 505f4d2b1a -s ours
am skip reason: subject contains skip directive

Change-Id: Idc0e9a20b8205525763a24143aae37a424bb85ac