Updated from global requirements

Change-Id: I7fb2ab0d17593f8c24cd23dbf9f4af1d4b224d38