Updated from global requirements

Change-Id: Iea56589abd2f4a764bbd22fc92fb3d2a9189d276