A few changes on i577 branches

Change-Id: I7161049f1a1db6c3b1ad2a6784c7e2d479c708d6