Updated from global requirements

Change-Id: Ib0b48969350c16427e05470edcf1d240819798fb
Merge "Updated from global requirements"