Merge changes from topic 'battery_smear_move' into oc-dev am: 883db32859 am: bd499f9319
am: da26705adc

Change-Id: I9ebc48f43c00b8447a4726e4a12be1690b10dd2b