Updated from global requirements

Change-Id: I44b10975f90ef576cea38b48c00c8df3d771011a