Updated from global requirements

Change-Id: I7146b96e5814ba07ac5ef9ef8d14e36247516af1