Updated from global requirements

Change-Id: Ie52abd0eeab5042606855c4ce668f3b3f11a2d2c