Updated from global requirements

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