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

Change-Id: Ie66136a1782f2e7ba18b33f70672552a3239f0d6