[automerger skipped] Import translations. DO NOT MERGE skipped: 32c08741ec skipped: 8062f299b1
am: 998f40e6c5  -s ours

Change-Id: Ifdbc60e6748887feedc47eb60843d231dae46146