Merge "Don't allow stacks above pinned stack." into oc-dev
am: 22d4ef008d

Change-Id: I740f62046d5f37a634e8c656ee76a82ecb244ff1