Import translations. DO NOT MERGE
am: 4894635d8c  -s ours

Change-Id: Iec715dbbd6758cdec4eb020e9d82e1a71002da28