Updated from global requirements

Change-Id: I4c41dcbdb84b4d8f0d2d292f23bbbe4a471b224a