[automerger skipped] Import translations. DO NOT MERGE am: 65d2da7213 -s ours am: d5d6a49ce8 -s ours
am: 35ea9cfe4c -s ours
am skip reason: subject contains skip directive

Change-Id: Icdb6d1352cbdbe1ebcef8b192f6cfd809584f489