Updated from global requirements

Change-Id: I8b40d47714cf20f8bc9936f36666241cf92146d0