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

Change-Id: Ia5f18638858ba3507e1bdccd7bf91f69d0bf8765