Updated from global requirements

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