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

Change-Id: Iecaeeab6e287a42815378fad53f93cb19c3c84a2