Squash KVT49L Changes

Change-Id: I1e58974ce24550f8fe0fe702f9fc0a309c4e064f