Updated from global requirements

Change-Id: Ie8e0c9e644f99213c487303572be8d7ae36c8129