Merge "Fix stack test on arm32" am: 7ff1eb698c
am: 53e56177b5

Change-Id: I8f9f6f6db412888fef6ab752bacf634d6c460d30