LS Buttons: Code cleanup

Change-Id: Iada4ede77f6f438b79be43e234afae8bb68224f7
Merge "LS Buttons: Code cleanup" into kitkat3