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

Change-Id: Ic348698e45fb38fb865d6e1959328829c587809c