[automerger skipped] Import translations. DO NOT MERGE am: 88a792275e -s ours am: 699368c15b -s ours
am skip reason: subject contains skip directive

Change-Id: I17d65bb3ca11b3a24837156ae25ec76b6b5fcd94