Updated from global requirements

Change-Id: Id39409789a5d47a94df2f496a006f77a443a0e6b