Fixes: 36126001 Test: VirtualContainerActivityTest pass Change-Id: I3b8fe835cd7c7f39c8e2cb8f2daca71b03236a1f