Updated from global requirements

Change-Id: If43e8d2a33137359b94c5fb0a39abb8c2489b720