Import translations. DO NOT MERGE am: bfb4048082  -s ours am: fa1cfd3258  -s ours am: 47809c3c1d  -s ours
am: 2a40662b54  -s ours

Change-Id: I9cf7fe241f166a9079424dad572765a32d6b261d