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

Change-Id: I286029eaa7c5427a73c5074d80e87a4f416cfb24