Updated from global requirements

Change-Id: Ib7f6bee2eec3d3f98b50b275838c4525148afc31