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

Change-Id: I7a7e75417e99382c7f8b3692369f046d4ecf6039