Updated from global requirements

Change-Id: I0683d5d4a501dbd9d0b3389d39fb77c5dfe271ea