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

Change-Id: Ieaa7f260fdab2f969b7bf0807c04126c6bffed95