[automerger skipped] Import translations. DO NOT MERGE am: 283bf918ab -s ours
am: 338cdaf247 -s ours
am skip reason: subject contains skip directive

Change-Id: Iaca706eba39d98295a3a6143e1149a2ef7a16cfb