Updated from global requirements

Change-Id: I7792f61717cbf09d0d02b00fbe4b885cc34eb94b