Updated from global requirements

Change-Id: Ib244a9a715f113659a24d88e19ff3c042bc0e320