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

Change-Id: Ie4b751b4d1417e69896c44e93fda62cdd6766b13