Updated from global requirements

Change-Id: Ia6066ddd02cbf7c50998ee5b54fc65cd46d7cf8d