Fix stack-pointer constructed sp<>. am: e951f2a640
am: 2a2a43cb11

Change-Id: I9c89462a37ebd4cf7befbf4729905963e286f3b0