Back-fill updates from PLASMA repo.