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

Change-Id: Ia6cc7e602fc7c4a6fab2469563c3b6ba86785e20