Updated from global requirements

Change-Id: I071c3f841d16b13c5288d693c704fa5d1a231309