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

Change-Id: I9cadf1b43bc055fffa72a6bb96f929c5e5ed28dc