[automerger skipped] Import translations. DO NOT MERGE am: b9e9ce91af -s ours am: 77ce29cdba -s ours
am: 15872a6866 -s ours
am skip reason: subject contains skip directive

Change-Id: I822be1dd08adc65cf93e4bfe061dfa6eea429c6a