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

Change-Id: Id270d186f4c135c8e3b43309f6c2d2103e479747