Updated from global requirements

Change-Id: I25004d42bf2239bd9aa3a7f919cc37256a60f42a