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

Change-Id: I9d57bb47a171a70532b89bb92f78b7c991faac2e