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

Change-Id: I0d6c15ed91f33cee1f3cc22f6fd7dad70241a35f