Updated from global requirements

Change-Id: If62daf2539ff69323c905c12c19e041f83ef8eb2
Merge "Updated from global requirements"