E2E 1.35 codefixes

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