Updated from global requirements

Change-Id: Idaaea149856485823643c1b13d0921cd2b6e5d25