Updated from global requirements

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