Updated from global requirements

Change-Id: If0d58de9daeb46b5190d0c568a590d883aeac9e9