Import translations. DO NOT MERGE
am: aad7947684  -s ours

Change-Id: I7d1ac0b03f66e4afb5d9c5fb3908c3018a20159d