[automerger skipped] Import translations. DO NOT MERGE skipped: 2c3e611a18 skipped: 218841a6dd
am: 8eb39fb0f4  -s ours

Change-Id: Iadcf60e51485dc0952c6f7800a996e91585854a5