Updated from global requirements

Change-Id: Ice5da31fbd5b5689ced6326f195a2241c6220083