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

Change-Id: I21b976b20b3c65f753f5ff2694c413bd7764eba9