E2E 1.35 - nullflavor cleanup

Change-Id: I56f505421aa0ad389e11e5443a8a529f61c0c674
Signed-off-by: Jeremy Ho <jujaga@gmail.com>