Updated from global requirements

Change-Id: I7d528afc3051e423e4a405ba1bdc0cb4cc5a9071