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

Change-Id: I4be254c9d13502ae3462845d6946e4d24036f0a4