Updated from global requirements

Change-Id: I37d8b329a3f1626c7755faca0e9abc4dfe6aca95