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

Change-Id: I6e8d888090a02fe8cb9c24effb9d11f28fa2988b