Updated from global requirements

Change-Id: Ie80ea287ce24b2ecca02463061bac77c1fe78735