[automerger skipped] Import translations. DO NOT MERGE am: cf0abd7454 -s ours
am: 51ba6b1186 -s ours
am skip reason: subject contains skip directive

Change-Id: I041cf56cc3684e98a3f135400ea12470c468dd95