Updated from global requirements

Change-Id: Ic109848be099e382e2f946bf2b3b0bcc0b055049
Merge "Updated from global requirements"