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

Change-Id: Ib440f82e3fe673be9aaa79557166119689d7446e