Updated from global requirements

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