Updated from global requirements

Change-Id: I133c26e6e879a3dc407bc687005828fe4130043a