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

Change-Id: I9f3655fbe2bd67398e5f5f7b876922ba79824e53