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

am skip reason: subject contains skip directive

Change-Id: Ic4b28459bd4f3a4b6db95bb37849b56718066822