Updated from global requirements

Change-Id: I3d63fdd11c5b90daedcb254d56469691f7f3075a