Add fixes from LS which didn't have a commit on github.
Not sure where these came from but they seem legit and are in the CM
base.

Change-Id: I77f2aac3c3641522729f695f2f5a547f220af80b