Updated from global requirements

Change-Id: Ief3ff160a479dfb1d0602038ba7c14580ec08d21