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

Change-Id: Iffed7e0d66fa11acd01513578a3e3f7b981a170c