Updated from global requirements

Change-Id: I59b276d83dd40d82e5713d9e8d1991bd0c41fa56