Updated from global requirements

Change-Id: I9d04f270038ba647a4a0ad849270aca2ea879874