Import translations. DO NOT MERGE
am: 2cabbaaecf  -s ours

Change-Id: Id05157ba890e036645d06bf0106d3da51b8a1c7c