Import translations. DO NOT MERGE am: fa19a401cc  -s ours
am: 7554eb2329  -s ours

Change-Id: I405f37e55ddc3cc43fe4ee51824f8f1b3a38bc29