[automerger skipped] Import translations. DO NOT MERGE
am: f47dd9d1ec  -s ours

Change-Id: I7d013535e134306dcf48e3ad5e61807bb638a554