Updated from global requirements

Change-Id: I042d377b2eb78f64dbf81f102a6f8ca013fa8570