Updated from global requirements

Change-Id: I1cbb40e85dbbdb2c5e8426e1b40af9eb809fa9be