[automerger skipped] Import translations. DO NOT MERGE am: f1e80dffbc -s ours am: ed54922c14 -s ours
am: 02e388a87c -s ours
am skip reason: subject contains skip directive

Change-Id: I7452021ed698b5b29d0c9e498e067a30430af834