Updated from global requirements

Change-Id: Ib3d12f23888a474e1db9bce0982e56ae7397ceca