some additional changes for CyanDream

Change-Id: Id6e90a2c8534ce66d1473f286794c372f7d20f96