Updated from global requirements

Change-Id: I98764a5281f5ae786bb6b56c1ad9d086e67df8b9