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

Change-Id: I1aeadd8ac75fbbf3b9ba7bd2ec279e0561d6c7fa