Updated from global requirements

Change-Id: Idf94dbca9d65664715e64c049e6a8337be7d6c62