Import translations. DO NOT MERGE am: a01540d3d5  -s ours am: b6bf465506  -s ours
am: 2d44c898e5  -s ours

Change-Id: Ia754dcb7c2bf7c8ac1179dc06119430d8dd51d99