[automerger skipped] Import translations. DO NOT MERGE am: 57088b8381 -s ours am: c4b9dbfbaf -s ours
am: c4a53258c5 -s ours
am skip reason: subject contains skip directive

Change-Id: I6650174dc49c3ba40f4b69925f592b1c7b6224e9