Updated from global requirements

Change-Id: I413514eb61579dabac22909e30b8e86aca0b3a0e