Import translations. DO NOT MERGE am: 18935bdfc9 -s ours am: 028dcb2eff -s ours
am: 8ac46e4ccd -s ours
Change-Id: I3d30c6f67861c700e75d0152a3f29c6efb9569c9
This commit is contained in: