Little improvement for subnets test
(cherry picked from commit 3dd8320)

Change-Id: I957e8905ee0aae663ccb33ce95f5c05acb81c440