Updated from global requirements

Change-Id: I1cb3c0695617f021b9d30e558656bff06207666f