Updated from global requirements

Change-Id: Ief191c806d8cf74973ccc1774419b32d7dc4bca2