Updated from global requirements

Change-Id: Ib783f2a6a4aecb4b438641d4616813d9aca252f9