Updated from global requirements

Change-Id: I3cad251c0d80f8deef46fa93ce80a42fe82d3e1f