CraveOS changes

Change-Id: Ib218fd23f77394cebf81d49a16def2bad830fcb8