Updated from global requirements

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