Updated from global requirements

Change-Id: I60d4f256c9afde10b1662a8fc5b95a244c0adf07