Updated from global requirements

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