more changes for initial release

Change-Id: I80e7180e29ac043c428b57ddd7ef2d9788df19b9