Updated from global requirements

Change-Id: I6dc73504ba274e99cbc18b91c631cad2d56aa45a