Further changes to the rc2-507 package

Change-Id: I57891a4c60d78584726211d3d93a39f80174a757