[automerger skipped] Import translations. DO NOT MERGE skipped: 9f043e5e58 skipped: cc2c91ba39
am: b1615a6d90  -s ours

Change-Id: I9f949a268c9c25c19c731269b3299b4ca2d7aa28