Updated from global requirements

Change-Id: I6cb91d1c11a702ca8f779dbd1bcff5f190597c3c