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

Change-Id: I22a3b3c49c309e7ccd9424f16841722fd1a228b0