Updated from global requirements

Change-Id: Ib6ae25e8ff6d141420736e702901a18dbd7af711