Updated from global requirements

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