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

Change-Id: Id27e4700c8b1fc801e0c0821ff1b1b4de6c810c1