Fix stack-pointer constructed sp<>. am: e951f2a640 am: 9aabfecab2

Change-Id: I1c85bb16bcdd47a6239a7ffb9fadee27b775f2cb