Updated from global requirements

Change-Id: I722dbe5303fc31c461f99bcab1e617ae9e737d23