Updated from global requirements

Change-Id: Ifb298bbb37a94e1d4f5e537b7f4eb086da4c95a9