Import changes from LiquidSmooth
Github didn't have a commit for these, but they're in the CM base and
seem legit.

Change-Id: I1b3f702daa436c7a64bb64d1bc0c5802b9fc1451