Import translations. DO NOT MERGE am: c51dd09193  -s ours am: 0966a9085d  -s ours
am: fddeb9af1a  -s ours

Change-Id: Ib1d712c2b11d1aaa9de5c7a33a828dbbd2bbd65f