[automerger skipped] Import translations. DO NOT MERGE am: 86dfbd6254 -s ours
am: 5c90432dc1 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic722d4de71c99e005a84f5650c8bf9c82c392cd0