Tracking changes for RootBox 4.0

Change-Id: Ia58cf282a4c8962e49a54c206110f13299c79874