Updated from global requirements

Change-Id: Idd9422cbcde846fd621a8c674273ee9d2d9b7df9