Updated from global requirements

Change-Id: If0cbfd373955f5a626143cf6ef8ed41b12346fb1