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

Change-Id: I80e0262cdd14a224e23376a773e6a5ff515d0890