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

Change-Id: I83e8bb805ab7d73f63136133a291ecfeb6d762db