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

Change-Id: Id7c539e18d0049368bf731fe26bfe9ffaacf586e