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

Change-Id: I56468e249d157f9befdeeb06feb108dfbb143e03