Updated from global requirements

Change-Id: Id65aab9522b566eb04e28f59f182f86c5beeb45b