[automerger skipped] Import translations. DO NOT MERGE am: 5a690f3c4c -s ours am: 1ccff0ddc6 -s ours
am: 1aef5e268e -s ours
am skip reason: subject contains skip directive

Change-Id: I07b5bb4f5cfdaec20778a7db0e96eae0395b330b