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

Change-Id: I604824e73433ae30bf74e4f96eb863c41b5433fe