Updated from global requirements

Change-Id: Id9b7372bd1788324dff1251ecaccaab4836d96cf