Updated from global requirements

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