Updated from global requirements

Change-Id: I8a630229ed15edbb029b23c6ffbaeb503d83fc5a