Merge "[automerger skipped] Import translations. DO NOT MERGE am: e6c59cd920 -s ours am: b227fad96a -s ours am: 32c8779c92 -s ours
am: fa115507c2 -s ours
am skip reason: subject contains skip directive

Change-Id: I75dc7ab08d89dd53293fbe4ed871508b8738d02a