Updated from global requirements

Change-Id: I69bbae45a923e452894ae2f73cc1ec5de70b6e32