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

Change-Id: I4bd64ee161e2ae8b189b82574e115698459626c9