Updated from global requirements

Change-Id: I1c05c375be86dffd8b4fadd536c170df3c2cd3ed