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

Change-Id: I7eeb038b93fe47601b946e74d0309e6923e048d5