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

Change-Id: I2efef11c564f0f12b7cda559ddfe4ea370234bdd