[automerger skipped] Import translations. DO NOT MERGE am: 4963846b28 -s ours am: 9349fdce55 -s ours
am skip reason: subject contains skip directive

Change-Id: Iac63bf1bac5bb4805f9ab19b10e64b74872eff67