Updated from global requirements

Change-Id: Ife33bd0939e6cf7def3e71e7c943a399fffaa160