[automerger skipped] Import translations. DO NOT MERGE am: f52b0bd3df -s ours am: 794e196aca -s ours
am: 6bba026d7b -s ours
am skip reason: subject contains skip directive

Change-Id: I2468ca5385132cba6087b88fac4279f77b127177