Updated from global requirements

Change-Id: Id43d52959670ad2e10961f6957e131e60e33fc31