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

Change-Id: I45139dc6d50abb553da53bbdfd46f3f9c95fab47