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

Change-Id: I4115cb53ecd2d1ba47104022407d99626fd1b050