Updates from evervolv.

Change-Id: I90cd35ec501c4c1749759cb8f72709c88d5ce40b
Signed-off-by: helicopter88 <johnlemon.lol@gmail.com>