[automerger skipped] Import translations. DO NOT MERGE am: 82f1099361 -s ours am: b198566155 -s ours
am: 4db7b34c2b -s ours
am skip reason: subject contains skip directive

Change-Id: I5b6d1d0eba5a3e8dd797c6d0659904cdf611fbf5