Updated from global requirements

Change-Id: Id669e640a38c5b31a36ed183ca989c9d5d23b8b0