Updated from global requirements

Change-Id: I9ea9cef1ea6d3bd980fce949eca0fd9c19b5d9bf