Fix nested() for py3

nested() should return enter_context instead of
nothing.

Change-Id: I910eace453d07e2f9a12dd0ce0eca22f4d155472
Merge "Fix nested() for py3"