Updated from global requirements

Change-Id: I33926a26b8342b26dd37e434d562a594ab149554