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

Change-Id: I761c0de62f1804965aeff8f00f44c4b1dbddcee2