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

Change-Id: Iae1bbc92d68d117d8ca3d5be730c0cb95e87cb0c