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

Change-Id: I207f439e3a83427b0e7d71695ba5f2e6db2b381f