Updated from global requirements

Change-Id: Ic2fd2ffb3d5c464d51933e97c6715f8608770487