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

Change-Id: I850b4e1738fed26870fef0c896387da4174eb965