Updated from global requirements

Change-Id: I87cf25c6ebf28999eac1f57b10c900e25dbf686c