Updated from global requirements

Change-Id: I8a805552586c1c7633dfa65218fb6864985525f8