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

Change-Id: I6c6ce26c5b8e1d55770f6b6d9491d03b95148b3a