Merge branch 'stable-3.2' into stable-3.3 * stable-3.2: Fix the junit test tag Change-Id: I5935a14ccf61289d6c86371f894a168546a32364