[automerger skipped] Import translations. DO NOT MERGE
am: e12376d87e  -s ours

Change-Id: Ib86a8550ba798e192ea342b0ec350ac6d5fc888d