Updated from global requirements

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