Updated from global requirements

Change-Id: Iabf8e9dcb63287d9db487b36cc7014a9097e705e