Add Glowpad Changes

Change-Id: I0792a994c99ff7bec1912902d50ceea0735c8008