Updated from global requirements

Change-Id: I3b690a63fae7b3f1aaac4d6cc656c220a5ffe8fc