[automerger skipped] Import translations. DO NOT MERGE skipped: 4cd0777c01 skipped: 03130e4fbb
am: 0a09cd4b21  -s ours

Change-Id: I939c7d74e9c575b6ed205dc5713579bb03cb31d5