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

Change-Id: Ib915c7317e6c55ee53febef269a06e82ac9c6da0