Updated from global requirements

Change-Id: I21af2a9d539414f717c45dca14f7c18f2a860bf1