Updated from global requirements

Change-Id: I48350d765a1345a98de07bc1e269940b849840b1