Import translations. DO NOT MERGE am: dfb6ca8235  -s ours am: 529015a5ca  -s ours
am: 3c774bdbf5  -s ours

Change-Id: Id67eb8922c00b10147cbf74f982098f4f7e20d23