Merge branch 'stable-3.3' * stable-3.3: Fix the junit test tag Change-Id: Ib9ddf58d7e07fd4b44d1ac04a281fb5a66ef6cdf