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

Change-Id: I654a0a9766a268792393cee9b335e60e23a062e5