2011 xperias don't use addremoves

Change-Id: Ib35e9e5f085a5f93dcf2ea6af19066df3fe48d65
Merge PAC-man/pac-5.0 into pac-5.0

Change-Id: Ia436cd5f95f63438dab085835fe81fd402de5331