Import translations. DO NOT MERGE am: b60dfc2ac1  -s ours am: 9b50e71b86  -s ours
am: af4f4171da  -s ours

Change-Id: I6559f1ef4fbbf95bf196e78ae88eeff012e05aee