[automerger skipped] Import translations. DO NOT MERGE am: 0185aa3fc9 -s ours
am: 7776da9100 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib691073666da77003b8390e11a5baabc4e449e43