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

Change-Id: Id7765e96a231b0ba1cc15c5ba05d5bf26ea4583c