[automerger skipped] Import translations. DO NOT MERGE skipped: 0ea56e1f78 skipped: 2ddbc2a955
am: eea95afb95  -s ours

Change-Id: I9e016aaf8ec29ee9026886f558029fe8737a09fc