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

Change-Id: I43828b21453537b2f568b25be3684608922b9786