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

Change-Id: Icb5a00195eec856f1e255686895d13a8f643f71a