[automerger skipped] Import translations. DO NOT MERGE skipped: fb5d1738dd skipped: 0b7e5c37cc
am: 023ae30cdd  -s ours

Change-Id: Id625fa8ab91f53283f0e5985f13141e54d2dfe8e