Updated from global requirements

Change-Id: Iec02f17c18617a83c57444e2920891b73fa1758a