Updated from global requirements

Change-Id: I9c7c8f0de2174263c993fc6e08f90bbe0ebcae95