Merge "Adding null check to RemoteVvmTaskManager." am: db5e2534db am: 690f92ca24 am: f775dd9ec9
am: f34c652f00

Change-Id: I26dd4529fc5106a1073c920510871926952c62fa