Merge "Fix PinnedStackTests#testPinnedStackWithDockedStack" into rvc-dev am: 72d1e65771

Change-Id: Ifd3cd1e3457d0fc908696827cb5358ab6411c215