Merge \"Stack: Fix tool for long stacks\"
am: 784eace983

Change-Id: I314da26e0e32e7e59a1ea3483e141b739b887077