[automerger skipped] Import translations. DO NOT MERGE am: 00cced240d -s ours
am: 1a7a0ecbc4 -s ours
am skip reason: subject contains skip directive

Change-Id: Iacb8a7ec806f53fdf2179313af7730f588bffa04