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

Change-Id: Ic2ddae11cf730cedbc0be815c9e2cdab6e6a5014