[automerger skipped] Import translations. DO NOT MERGE am: 88a792275e -s ours am: b982d6b7e1 -s ours am: 8724feb709 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic9445dab8fe5d130b036d02dcc331c4d232196ea