WIP: more changes to mulStage1

Change-Id: I18df45bbbcfbe59aedc52cc928016471a0c27bad