Merge "Fixed exceptions during test tearDown" into oc-dev
am: 879450ab00

Change-Id: Iba25a35ed2dcd8c463d0e91a44356d76f0bad151