Updated from global requirements

Change-Id: Idf777721698dd6eebd62c694423e746df2e2fb9b