Updated from global requirements

Change-Id: I726f4b9cfecddb90fe6f89f95689713dffd34fbc