Updated from global requirements

Change-Id: Ifaa9707b5d9c8e1a7744fe6d83795ea400cc6dd7