[automerger skipped] Import translations. DO NOT MERGE am: 6c01facd59 -s ours am: 3144619f1a -s ours
am skip reason: subject contains skip directive

Change-Id: I736af76994f19dabedb7cfcb9446a991fd04c56c