Updated from global requirements

Change-Id: I8d7508dac151e3854971588b5d0376afb6d95cd8