Updated from global requirements

Change-Id: I71fd4b1292d68279d75569dc022745b75da66eab