Updated from global requirements

Change-Id: Ib34efa77d08998f2c8ee5902623da990262da0e0