Updated from global requirements

Change-Id: I71bcfc79ddfd7d2da281508b762af049b94af788