Import translations. DO NOT MERGE am: 1efdbed5c8  -s ours
am: fcf430812e  -s ours

Change-Id: I761d455ee6df5cd9df6b25a5762c798bd733df44