Updated from global requirements

Change-Id: I22831dbe79fe30e6932d4df068c7309c025dc8c5