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

Change-Id: Ibf8e0fb3c6d8831b543ef09f2cce8a9098ac4f8c