[automerger skipped] Import translations. DO NOT MERGE am: 8098c5f1a8 -s ours
am: b922ca4050 -s ours
am skip reason: subject contains skip directive

Change-Id: Ibeee73378fcd2e19e9dacf2899aef54d5532f1ea