Import translations. DO NOT MERGE am: 836e990  -s ours am: 506affb  -s ours
am: 71b2149  -s ours

* commit '71b21495833676b8cbee1b24475dd88f804a5329':

Change-Id: Iee2c763bf8e852878ad1dce71aba37e6edd4d96c