Updated from global requirements

Change-Id: I46319c6f5e90d1256174f8a5b6a39c13da3d5bb9