[automerger skipped] Import translations. DO NOT MERGE skipped: 439fdb13fc skipped: a98b588532 am: 1221af165e  -s ours
am: aa961b929b  -s ours

Change-Id: Ic0790355c37d9f3501b519dc773466a53f41b3cc