Updated from global requirements

Change-Id: I7a7fac9b10b091404bd0c0a8d8d58dbab629c1f2