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

Change-Id: I9222ea8815b60d92a7955472056f74cd6669f9fe