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

Change-Id: I2c8daf0f23090fedf2ed0b24f743a50efd4d3a54