[automerger skipped] Import translations. DO NOT MERGE am: b7419efc90 -s ours
am: b1878fbbe1 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie9d9bc1f455acea32cf7b2fda11c3717eedc42cd