Updated from global requirements

Change-Id: Iea299644aa2869a798dd1814971878082b5e51c1