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

Change-Id: I4ff4a94f634207aa24c72788a755565798782cba