Merge changes from topic 'battery_smear_move' into oc-dev am: 883db32859
am: 308d0dd03c

Change-Id: Ifa87d06d51598b005a6f51d2bf3a2ac936848d6e