Updated from global requirements

Change-Id: I533698fb1c222b2b61fc4d3769d7d9dce155a332