Updated from global requirements

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