[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 5d2584f6d7 -s ours am: bd112fb44f -s ours am: 5b374c8648 -s ours
am skip reason: subject contains skip directive

Change-Id: If58434964c7cd485cbb579c05eabdde68beaf0ab