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

Change-Id: I5ac0fa536a867a5fcf9323b7bdc694b0cedc8fb7