Updated from global requirements

Change-Id: Iaa2102b679731c3fc682686dd718f609c2b9c8ea