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

Change-Id: I9c0510407818d9b5ebc12954d029e53f6f5574b5