Updated from global requirements

Change-Id: I2d39657625c5f6117714e09c340acd148088c4f9