[automerger skipped] Import translations. DO NOT MERGE am: 8dda6713c0 -s ours
am: 5f83b0c3ad -s ours
am skip reason: subject contains skip directive

Change-Id: Id5056e9b7279b54953fecd02ae4f92a94f9e5317