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

Change-Id: Id68bae980aaf0d4d3d041efd2b6cba17f1a1d09c