Updated from global requirements

Change-Id: I8268aeaa221e0d34fb357f92cf5e7fdbcf76e678