Updated from global requirements

Change-Id: I536eaabe7ebd7695dacef45a561a83f2db6d124a