Merge \"Merge \\\"Check if task was top of stack before it\\\'s removed\\\" into nyc-dev am: 94b4029f03 am: cfefb2b85c\" into nyc-mr1-dev-plus-aosp
am: e7135f6128

Change-Id: I4bf63c74ce91f3d4890c9a2b9f03588d624f7d73