[automerger skipped] Import translations. DO NOT MERGE am: 7851fab973 -s ours am: 9f84418306 -s ours
am skip reason: subject contains skip directive

Change-Id: Ice2af52ae37404ce59fa47895de965d52c0c722a