[automerger skipped] Import translations. DO NOT MERGE am: e6c59cd920 -s ours am: b227fad96a -s ours
am: 92c5a4fafd -s ours
am skip reason: subject contains skip directive

Change-Id: Id650db71b5de1ed86c95a02122870032118ff84b