Updated from global requirements

Change-Id: I0ff2b0d1f5099d5ab18fdf363f1a024e8a0dde84