Updated from global requirements

Change-Id: Ic2078b29040b28f36c5aaded7110ab4b635143ec