Merge "[automerger skipped] Import translations. DO NOT MERGE am: 8fc40586d7 -s ours am: c1bfef1d9c -s ours
am: ec841c2420 -s ours
am skip reason: subject contains skip directive

Change-Id: I3d14529d0c39abe5ec041e3bfcb96a0ba25ad8a6