Updated from global requirements

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