Import translations. DO NOT MERGE am: dc2a365170
-s ours am: 5ef2a55c95
-s ours
am: 9696521302
-s ours
Change-Id: I79b092b5694e6eb1a59f1e5c251e288fe775c798
This commit is contained in: