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

Change-Id: I4b6124e71f0275ee11a1d958e925573895e3653c